Merge "Clean up keystore owners" into main