QA and Release of Version 21. Closes #373. Closes #372.