AH-333 Master merged into AH-333

Merge, code cleanup and remade edgeCollision test.