Log meta-data
Merge branch 'dev' into 2.4