Merge "Don't store customizations separately." into main