Merge branch 'processor' into sonots