Merge "Return generate-salt-model back as it is required for TryMCP"