[Eas-dev] [Integration Branch] Update 06-July-2018