Merge pull request #728 from leider/master

transfer less bytes over network to improve the experience of the platform