[sd2_mr0623] Misc changes.