Added proper exclusion check during automatic update
Merge branch '2.0'