Merge branch 'features/glitch-soc-frontend' into 'develop'