AI-827 : unified ActivityDTO and ActivityFormDTO handling