Merge branch 'fix/reblog-api' into 'develop'