Merge "Fix AC-4 parser bugs according to specification"