Merged with changes made in head in the meantime