apiAddressGeneratorReturnQueue is now in the shared module