Update function tied to release
Merge branch 'release/release-3' into develop