Merge branch 'update-frontend-2021-03-01' into 'develop'