Control Panel: migration bug fixes
Merge remote-tracking branch 'origin/1.1.7' into 1.1.7