merge the 0.7.20.2 upload