Merge branch 'feature-clone' into development
Merge branch 'master' into development
Minor menu fix
Merge branch 'development'