Merge branch 'optional-retry-queue' into 'develop'