Merged in v1.4403 changes to trunk