am 9fae2ecc: Merge "Handle nested folder case"

* commit '9fae2ecc5fb777230bde74e4a099fb4e98bf34b4':
  Handle nested folder case