Merge "Use new widget functionality to reconfigure widget" into sc-dev