r21391: add supporting for