Merge "Sequentially handle enable and disable"