Merge "Further fix on issue #16013164" into lmp-dev