Merge remote-tracking branch 'origin/hotfix/fix_release_dependencies' into hotfix/fix_release_dependencies