Final commit before merge into master.