Merge branch 'mr/retry-queue-remove-fold' into 'develop'