correction integration of recent patches (part2)