Merge branch 'inna-wizja'