Corrected integration to remove incorrect merge fix for issue 0024057 with fix for...