Feature/zen6739

Fixes ZEN-6739.

Reviewed by Danny Garcia (for ZEN-6924).
Note that part of the issue has been split off into ZEN-7532 for europa.