LPS-46640
LPS-46641
LPS-46642
LPS 46642 - Source formatting
LPS-46643
LPS-46644
LPS-46644 - Source formatting