am 04bd9610: (-s ours) am 404d6bdd: CTS Version 2.3 R7

* commit '04bd9610d91278c457fcc481826da927f4eb33d6':
  CTS Version 2.3 R7