Merge "Fix dynamic columns in QSCustomizer" into sc-dev