LPS-41662 Revert as it's breaking tests
LPS-41688 Fix possible NPE
LPS-41688 SF