Update to June 24 (894b43a15e)

Pick-up the latest changes.