SOC-3174 | ActivityWhereBuilder static instances are leading to contention