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