2-3-stable is broken

Running the generate task results in exceptions.
Two of these commits fix the issue, the third updates the README
git cherry-pick Accepted_Commits