Merge branch 'various-fixes'
Merge branch 'abort-on-empty-answer'