Feature/lost merges

Some merges lost during migration.