#14438 Minor changes