[Eas-dev] [Integration Branch] Update 13-Apr-2018