Merge branch 'feature/fix-clone-project' into next