Merge branch 'Tachi107-small-changes' into dev