Intent to backport OAK-6392

[Marcel Reutegger]

Hi,

I'd like to backport OAK-6392 to the maintenance branches. The issue is 
relevant for tooling such as upgrade and may result in inconsistent 
repositories.

Regards
 Marcel