SOC-3891 | [Migration] Failed to comment on an activity from Platform 3.5
Merge commit '2461b50f4a6e3da8010555251b0ef96d9ea01080' into HEAD