Merge "Customization option entries (2/2)" into main