Adding missed checkin of CSD Spring implementation