sync with latest spec's def
auto-merge staging into master