Merge changes by Martyn