Add user data to recursion guard; get ready for RC1 (again)

21 files changed