Merge "add salt-override"