[ issue 1156 ] Minor changes