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