CONN-1068 and CONN-1092: Cleaning white spaces..