Merge #14696 with lint fixes