[Eas-dev] [Integration Branch] Update 8-June-2018