LPS-32146 encapsulate logic