LPS-36184

This will be backported to ee-6.1.x in so-activities-hook. Please let Matt know if you want us to do the backport