am 78d47240: Merge "Fixed review comments" into klp-dev

* commit '78d47240fb71a55897c1ef2e2d06492acbe29ad6':
  Fixed review comments