[416470] Delete conflicting overridden static methods
15 files changed