Merge branch 'chore/frontends-config-clarification' into 'develop'