And again, merge change form D6