Merge "Revert "Ensure that disable is enqueued"" into main