Preparing for 1.7.21 release