1.6.2 support with water source blocking feature.