Merge "Add supportsAdn()"