Backport PR #1158 on branch v3-dev (Update /generate to not split classes & functions across cells)

Backport PR #1158 on branch v3-dev (Update /generate to not split classes & functions across cells) #1807