Merge master and fix notification migration sequence