Re-added regex to test collection name before passing it to condition block
Merge branch 'master' into staging