Evgeny's commit on behalf of Hamster