Control Panel: extension settings page small refactoring
Merge remote-tracking branch 'origin/1.1.5' into 1.1.5