Merge development PoC codebase