Merge branch 'mix-lock' into 'develop'