#10689 - still working on activity