UI: Fix load order of masthead
Merge stable
Merge