Merge branch 'jc/logopt' into next