Merge branch 'jt/push-avoid-lazy-fetch'