Apply missed part of [sd2_mr0611]