Fix for #314
manual merge
Merge branch 'gjb2048-master_MDL-41506'