Merge change 21127

* changes:
  Remove 'ctor-dtor-privacy' warning, as it's not very usefull.