Initial commit of patch 943137