the previous commit didn't fix the problem, this one does
fixing cherry-pick stuff
updating tests and make nested record pass all tests