Merge "Fix sample info parsing" into jb-mr2-dev