Merge branch 'bugfix/pinned-statuses' into 'develop'