Converted beam collision functions
Conversion complete
Update to trunk 10426