Fix for issue #7548 [WIP]