This commit also includes minor aesthetic changes like removal of trailing spaces.
Attach a file by drag & drop or click to upload