Merge branch 'feature/update-description-for-frontends-setting' into 'develop'