LPS-37457 fix compilation
LPS-37901 Fix broken tests
LPS-37457 Source formatting
LPS-37901 revert fix