am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev

* commit 'da77cee96d33aa015f90e537ce2d06e6853aac93':
  Fix sample info parsing