Updated to integration-20140618