Merge master in improve_unit_list branch