Issue 790: initial commit2