Intent to backport OAK-6685

[Marcel Reutegger]

Hi,

I'd like to backport OAK-6685 to the maintenance branches. The fix is 
simple and I consider the risk as very low.

Regards
 Marcel