Merge branch 'resolve_time' into mail.ru