Merge branch 'null-entropy' into development