Merge issue-819 into personal master