Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I006943a9076892d4262f8217c7c4c551e008586e
Merge topic '13764_clip_closed_surface_XML_FIX' into next

ef21a91 Fix Proxy definition of ClipClosedSurface