[Eas-dev] [Integration Branch] Update 23-July-2021