Merge some changes in SD controller section