Merge "Add case of infra salt-model"