This is the lost commit from !1724 (comment 2967749) with the fix for the log issue !1724 (comment 2966838)