Merge branch 'tom_dev'