Last changes before master merge