Merge branch 'jc/logsemantics'