Merge branch 'client-opt-23' into sp-23
Minor fix.