Release 3.21.1 rc2