Client Solution corrections
Merge commit '6ee92984ec039204a13a4e504d7f3ef0e31c73b7'