LPS-50364 apply to usages