import upstream version 1.9.20