LPS-38648

also has a commit to plugins