refs #33257
Merge remote-tracking branch 'origin/features/mypage-activity'