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