initial commit, on behest of #1139