[Eas-dev] [Integration Branch] Update 21-December-2018