Merge "Ensure that disable is enqueued" into main