update master build to be more like that used in dev branch
update master build to be more like that used in dev branch

Former-commit-id: 312dfe862a7249306dc9620716f4179582086ce4
latis-data/latis,latis-data/latis