remove redundant delegating class
EA-51351 (filter out missing modules)
Merge remote-tracking branch 'origin/master'