Last changes before the merge