Merge "Fix readback lengths" into jb-mr1-dev