[Eas-dev] [Integration Branch] Update 05-Jan-2018