[Eas-dev] [Integration Branch] Update 12-October-2018