MP1-4068 : Fix exception for OnAdded().
Merge remote-tracking branch 'remotes/upstream/master' into 1.4.0Fork_SEB_New_Master