LPS-49681 Simplified commits