Merge branch 'roland/getsym'