GIT OamBuffer2004Fix#a1257f7f4
