[Eas-dev] [Integration Branch] Update 14-September-2018