LPS-33393 Resolve compilation problems
LPS-33393 Source formatting
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP