Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Fix usage of DEFAULT_SKIP_INTERFACE_LIST

Change-Id: I0988ff97618178cc8299783decc44b929b6ded3c