temporary NDP workaround
bugfix: increment metric
+ metric type as exttype
manually added PR #928 because of reasons