Merge branch 'feature/restrict-c2s' into 'develop'