Issue #2122693 by alexpott: [HEAD BROKEN] follow-up to use Settings class.