Fix for makernote
Fix for makernote


Former-commit-id: 7d4b8972913f7d99ceda883c2633fece380eee3b [formerly 0c10eec2d52aa4505a7c68b4ca60ab915827473d]
Former-commit-id: 6b00a4d564ad1b275d5f28c0cb70147a50e8ce77 [formerly 2e176ae0f9efd7f809de9bcdcc27e0e9f26f0309]
Former-commit-id: d728904743ac5dc7a4ea21d04d44e184a23707f3
Former-commit-id: 92baaa9bf3fec1ac21b82f98947767c78bc100df
FSchiltz/RawParser,FSchiltz/RawParser,FSchiltz/RawParser