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