Backport of MONDRIAN-1385 in preparation for SP2013-03 3.5.5-R.