Changed default routing to prevent trigger of automatic search
Merge master to staging for version team city build 1.0.167