LPS-45966
LPS-45966 - Source formatting
LPS-45971
LPS-45979
LPS-45975