CSPACE-5678-D: More service binding bug fixes.