Issue #3194006 by dejan0, roman.haluska, Zevior: Remove deprecated or() method calls and use Condition instead