Merge branch 'fix-incremental-last-pattern' into dev