gh-91: Finished.
Merge branch 'gh-91' into next