Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev