Minor adaptation after merge process.