Merge "forgot to update queue builder"