Merge branch 'proxy-range-and-chunk' into 'develop'