Merge "Dissociate uses with environment uses."