Merged changes, branch ready.