Merge branch 'change-mix-location' into 'develop'