am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev

* commit '08ecf676e655ba7a86744f63045290d1e331c0f6':
  Bug fix and documentation clarification