Revise version constraints to dependencies to fix potential conflicts.
Merge branch 'develop'