Added on demand chunk loading
Merge commit 'ea3fd53c47eded9817a3d889e9ff9fb0b4003cd1'