merge in the preparation for v1.2.1rc2 release