Merge "[SDNC] Tuning fixes for SDNC" into guilin