Issue 829: initial commit