Merge branch 'lba48-opt'