[Eas-dev] [Integration Branch] Update 24-Nov-2017