am 0f0ccf07: Add new software features

* commit '0f0ccf07bad594b618f4fcce9a8f79a5bc188bb3':
  Add new software features