Clean-up capacity and capping reporting to guest.
Merge remote-tracking branch 'origin/master'