Merge branch 'fix-extend-2'