Fixed performance drop due to context loss handling
Fixed Geometry.merge for last commit