Merge 0.9.14-incubating changes back to master.