EB-8024: Changed query
Merge remote-tracking branch 'upstream/master'