GONRG-3352 Sync with master

5 jobs for GONRG-3352_Refactor_indexer-queue_with_a_new_variable in 1 minute and 22 seconds (queued for 5 seconds)