White space spaces

Ref: 3215

Ref: 3203

Ref: 3150

Ref: 2671

Ref: 2670

Ref: 2613

Ref: 2564

Ref: 2559

Ref: 1989

Ref: 1810