Merged patch from gvarsami for BZ 1033196