We already merged this change into dev, I just replicated it for b5. Related work items: #2161, #2174