SPTK 3.7, for review. #26342