Merge tag 'LA.UM.5.7.r1-08900-8x98.0' into n-mr1

"LA.UM.5.7.r1-08900-8x98.0"