[DO NOT MERGE] Backport some fixes from master to ozone-1.4#6646

adoroszlai merged 1 commit intoapache:ozone-1.4apache/ozone:ozone-1.4from

vtutrinov:vtutrinov/ozone-1.4-backportsvtutrinov/ozone:vtutrinov/ozone-1.4-backportsCopy head branch name to clipboard