Update Core to 7.21