s1689: initial commit
Merge branch 's1689'