LPS-44098 + LPS-44199 (bonus pack)

Resolution of both LPSs at the same time because they are closely related.

Done in several commits to explain the rationale behind the full change.