Merge "Update local kitchen-salt, model validation scripts"