Merge branch 'feature/allow-diff-without-name-arg' into develop