Follow up of #3672
Activity