First commit of debug shapes
merge and resolve conflicts