The PR introducing 5bb8069 got merged accidentally (the CI robot not respecting a hold). Hence, the feedback to that PR is merged separately. Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
5bb8069