first diamond nodes

Change-Id: I04902f7a97a78f3053843ec4a75600d30c845b2e