Merge branch 'fix/downgraded-deps' into 'develop'