Changed commit message and whitespace things for ticket #3258 (feature_3258)