Further tweaked Op-codes for non-required Entries, added new test file
merging