fix merge artifact

mentioned in issue #2352 (closed)

mentioned in issue #2353 (closed)

mentioned in issue #2354 (closed)

mentioned in issue #2355 (closed)

mentioned in issue #2356 (closed)

mentioned in issue #2357 (closed)

mentioned in issue #2358 (closed)

mentioned in issue #2359 (closed)

mentioned in issue #2360 (closed)