Initial commit of patch 971191