Rebuild questions from previous answers
Merge remote-tracking branch 'origin'