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