Never *EVER* choose a target that is not locked, FFS
Merge branch 'BleedingEdge' into QuesrorUIUpdate