Added Frank's pull request for iCnC backend.