Fix possible unwanted loading of boolean operator.
Merge branch '4.0'