1.1.2dev: Reverse merge [12418]. A different fix will be implemented. Refs #11129. 
1.1.2dev: Reverse merge [12418]. A different fix will be implemented. Refs #11129. 

pkdevbox/trac,pkdevbox/trac,pkdevbox/trac,pkdevbox/trac