Bug 559, changes to make optional intenal database key

No match.