[Eas-dev] [Integration Branch] Update 18-Nov-2021