SOS-1506
SOS-1507
LPS-34727 Fix Verify Layout
LPS-34727 Source formatting