Merge stable (smon) branch into master