Monolithic frontend commit
Merge branch 'master' into feature/frontend