us85 - Adapted structure of question activity
Merge remote-tracking branch 'origin/s06-us85' into dev