Derived classes for core exceptions are not needed. We can directly use base classes
Merge remote-tracking branch 'upstream/master'