lock generate decisions
unlock
Merge branch 'production' into haosun
Merge branch 'haosun'