sync back (3.951)

hopefully base is complete now