Fixes for subtheme issues

Closes #3600753

Merge request reports

Loading