Merge with Genesis 2.1