[Eas-dev] [Integration Branch] Update 17-August-2018