Merge "Add a separate queue for non-interactive users"