new version merge (v0.16.17)