SOS-1285
LPS-33977
LPS-33977 Test Formatting
SOS-1255