Issue 831: Initial commit
Merge remote branch 'fork/831'