Merge tag 'LA.UM.5.8.r1-01600-8x98.0' into n-mr1

"LA.UM.5.8.r1-01600-8x98.0"