[TIMOB-16115] Break setItems into two dispatch blocks
Merge pull request #5968 from vishalduggal/timob-16115

[TIMOB-16115] Break setItems into two dispatch blocks