am 57ab9435: Merge "Adjust samples output pages." into klp-dev

* commit '57ab94354c02b06f548293e22bd7186da11f07a2':
  Adjust samples output pages.