Applied content changes from Rewrite-Settings-Advanced-Spec-428
This MR aims to apply only the content changes (not structure changes) from https://gitlab.com/eyeo/specs/spec/merge_requests/270 in order to make the change manageable
Update: As of 6705d1ca it also contains the structure changes in a separate commit
Edited by Ursa Kacar