Merge branch 'master' into fetch_more