- many fixes, merge from or4 [37899]