LPS-51653 move logic to local when possible
LPS-51653 Regen