LPS-37405 - Forward porting source formatting