Revert "Merge branch 'chore/mix-lock-update' into 'develop'"