half of prev year merged
Merge branch 'merge_prev_answers'
build fix