Merge "Skip /metadata/sepolicy creation" into main