Merge branch 'bump-fe-2020-07-10' into 'develop'