automerge: 732e4ecb -s ours * commit '732e4ecb': DO NOT MERGE Fix lmp-sprout-dev build for generics addition