Merge branch 'ivan'