Merge branch 'master' into l2-extents-and-tracking