Key bug fix
Merge remote-tracking branch 'origin/metadata-extraction'