Yes, I think so. I followed the advice given in [PODLINGNAMESEARCH-37](https://issues.apache.org/jira/browse/PODLINGNAMESEARCH-37).