MODE-1769 Added todo to remove ISPN-specific logic