I did fix this, as a matter of fact.
Merge branch 'master' into ebr-logging