Merge "Sequentially handle enable and disable" into rvc-dev