Merge branch 'bugfix/fix-rejects' into 'develop'