Merge the following revisions from kernel-fun branch: