merge v2.16 and v2.17