schedule logic adjusted (splitting activities)
Merge remote-tracking branch 'origin/2.0' into 2.0
schedule logic adjusted (splitting activities)