Revert "Remove SNAPSHOT dependencies"

This reverts commit f92965fbadddf4fc86b914afadaaa44c23cbcfe7.
Merge branch 'release/2.5.0' into develop