Load activities fix
Merge origin/master