Merge changes I2731ef15,Ib4b03035

* changes:
  Add a timestamp touch rule.
  Remove the implicit "_" in subnames.