Make self.metadata
backward-compatible
#861
Merged
self.metadata
backward-compatible
#861