Case #4067 - Improved metadata dump