Merged in changes from the official v14.8 code.