Merge #14475 with lint fixes