Patch 1 for trac-28335