#260 added set of decisions
Merge remote branch 'fork/260'