Refs: #630 - added new test mode for regression test lp1299116
Merge branch 'master' into 3.x
Refs #630 - added test mode 3 for UK testing
Refs: #630