Code standards update for #4675