Merge branch 'topic/smverb'