SSP-1334 Fixed added support code.