Merge pull request #1061 from RadioFreeAsia/IX-9.14.0

additional test case & cleanup