Merge branch 'develop' into feature/hide-follows-remote