LPS-47551

LPS-47551 Mainly source format. You can squash my source format to yours branch.