Cherry picked commit from EclipseDeployment branch.