Merge "Fix broken logic in isValidTarget" into lmp-dev