[sd2_mr0625] Apply missed part of [sd2_mr0624]