APD-53: select AND operator by default.
Merge branch 'bugfix/APD-53' into develop