Addition to fix for BZ-1069117, and part of fix for BZ-1067591
Addition to fix for BZ-1069117 and BZ-1067591