Merge "Move WeakHandle to the Public API" into devel/master