Merge branch 'object-fetch-errors' into 'develop'