Add exception on many classes
Merge remote-tracking branch 'origin/master'
Add exception on many classes