Code standards for #4856