TESTING: remove ICat test which is now failing, since ICats no longer exist
TESTING: remove ICat test which is now failing, since ICats no longer exist
TESTING: remove ICat test which is now failing, since ICats no longer exist
Also remove empty dicat test
Merge -s ours from 8.34 into master
Merge -s ours from 8.36 into master
Merge remote branch 'remotes/origin/8.38'