Sync with 1.61 official version Reproducible: Always Steps to Reproduce: 1. 2. 3.
Created attachment 46110 [details, diff] hb-install-system.xml.patch
Committed. Thanks!