last changes before tag 1.6.1