This part is necessary for ISPN-4068 further changes.  I actually have additional modifications on that JIRA still to get it fully functional.