Merge "Enable easier burn in testing" into sc-dev