changes provided while C29005 implementation