v1.9.7rc3

Before the release, to test merged of rc1 and rc2