JBIDE-13799 - Source Lookup enhancements