Update build configs
merge master