SOC-3125 | Activity display throws exception after merge from master