blocked NamedObject property adaptation in ErrMessage (temp)
Merge remote-tracking branch 'origin/master'