Last changes before merge.