LPS-43392 rollback LPS-23374
LPS-43392 Source formatting