Resolves #545 Make all (applicable) settings multi-store-enabled