LPS-39662 Adapted to the source formatting in core