Eval return issue 953 and trace buffer 952