Pulling in changes from release/4.2