Merge from note brach.
Update: work tree.