Merge "Move customization options to proper projects (3/3)" into main