Resolve build error caused by merge of tag v3.4.12