upstream/0_git20170303
009966af · Actually set store types. ·