Adding message from PM to fix bug number 2396.
Merge branch 'master' into bstrong
Code review for fix targe node strategy bug #2396.
Removed redundant hint line (this is why there were two
copies of the hints).