Merge "BUG 2676 : Add some tuning parameters to improve the performance of CDS"