Merge "Generator improvements"