r20543: Merge some pidl bug fixes: