Merge branch 'ch/new_version'