merge fix for bug #27355