Sync with spec change
auto-merge staging into master