Merge branch 'tm1637'