Back-merge from for-linus just to make the further development easier.