BUG: 412401
FIXED-IN: 20.04.2
This is a quick and dirty fix which only adds to the technical debt
(which in this case is better than nothing). A proper fix requires code
refactoring (mainly targeted at improving separation of concerns and
logic deduplication) and adding unit tests at least for this
particular case.