[Eas-dev] [Integration Branch] Update 02-Feb-2018