Merge branch 'fix/frontend-errors' into 'dev'