Merge "Add an option to selectively disable changeId"