DOL-98 : forEach loop is replaced with index based for loop. The return doesn't work in forEach loop.