Merge "FSM9900: CDP support"