Fix MPS-19796 WatchedRoots must be optimized for it takes too much time on closing project
A couple model re-generated