Merge "Revert "Remove minor version from sepolicy version"" into main