merge changes from upstream, re-add zoom modification and remove volley