Merging in changes to protein_databases from hot-fixes