QFJ-802 Restore code generation for Fix 5.0 sp1 and sp2