Merge change 2115 into donut

* changes:
  bring the native_handle stuff back from master_gl