LPS-34007
LPS-34007 Source formatting
LPS-34188 Fix layout export