[sd2_mr0636] some corrects after merge