ToUpstream: Fix ADMANY new feature