LPS-48453 Keep consistency