Final changes before merge into master