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