LPS-31986 rebuilt as a hook plugin