Merge "Fix issue #2482423: Settings is broken due to dead-code stripping"