Initial commit of patch 950189