Merge remote-tracking branch 'mnem/gdc-vault'