Merge "Fix: Increase default cx_data_size"