Incorporated update from bug-1095