#660 - Fixed merge issues.