Merge branch 'lkho-pr/#10268'