d2df831d4f
Resolves conflicts from #12334 (merged to develop in 9a3f1f5383)
Resolves conflicts from #12334 (merged to develop in 9a3f1f5383)