Merge back from 2.21-pre1