Control Panel: migration from osc22rc2 bug fix