merge with stash, includes incrementing pids and default attribute values
merge
Merge remote branch 'origin/tdil' into tdil