#22306 - Updated commit to include changes to config
Updated unit tests
Removed redundant ref cancel boolean token