update to latest upstream dora branches, HYP-7683

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>