LPS-29713 - Source formatting
LPS-35350 - Source formatting