ActivityState
Merge remote-tracking branch 'origin/Jens'