Merge branch 'bugfix/status-url-field' into 'develop'