[Eas-dev] [Integration Branch] Update 22-Dec-2017