Merge "New flag for collecting sepolicy hash" into main