Merge branch 'feature/retry-queue' into 'develop'