removed break and return in each
Merge remote-tracking branch 'origin/dev' into dev