[tor-commits] [bridgedb/develop] Merge branch 'feature/25246' into develop