fix ZTS build
Merge remote-tracking branch 'origin/master' into str_size_and_int64