Correction for previous commit
Merge branch 'custom_frontend' into dev