Merge pull request #123 from apache/switch_to_ad_plugin_successor