Merge branch 'nd/fetch-capability-tweak'