Help to apply patch to 2.1 branch for JIRA 3003

[Jack Cai]

Looks like the patch for JIRA 3003 never made into the 2.1 branch. Could
someone help to commit that code? Thanks a lot.

-Jack