DF-3527 added water disableing for graphic options