Merge "Move SALT_OVERRIDES right after stack created"