[backport] formatting changes