Fixed host-context dump
Merge remote-tracking branch 'origin/master' into HEAD