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