fixed mixed-up increment index in activities fixup
Merge remote-tracking branch 'origin/development' into development