Prepare branch for 2021.2 point release