Merge changes Ib7d53620,I2d4c5d64

* changes:
  Add regex metric test
  Fix metrictests build and run failures