r8801: v4 changes