Merges origin with local changes to test programs.
Adds edge collision tracking to querying system.