[Eas-dev] [Integration Branch] Update 25-June-2020