Merge branch 'restart-settings-are-moved-too' into 'master'

Restart settings are moved too.



See merge request !2226