Good commit of all the merged stuff.