Merge branch 'np/dreflog'