Merge foxtacles/vaultmp/master