[v2.1.6] Bug fixes for the dress-up feature (Jun. 5th, 2025)