Merge "(Canvas) Unregister processor properly" into devel/master