Updated metadata driver version
Merge remote-tracking branch 'upstream/master'
Updated metadata driver version
updated parser to support file format with trailing spaces