Updates to 7.21