Merge "sdnc update"