Intent to backport OAK-7152

[Marcel Reutegger]

Hi,

I will backport OAK-7152 to all maintenance branches. The fix is trivial and 
very low risk because the method currently simply does not return.

Regards
 Marcel