Merge branch 'decision-cleanup'