Use same code style as in master
use same code style as #3171