LPS-45973
LPS-45974
LPS-45974 - Source formatting
Revert "LPS-45974 - Source formatting"

This reverts commit 17b38962908b2c76005e3bbd45a94e01c86d68db.
Revert "LPS-45974"

This reverts commit 6bceed9e69dfdc636aacb16f2a7514429c7b1072.