Merged Ink v2 (dev)