Merge "Unit test automation for Multi-Default Tracking" into sc-dev