rework how locals are merged
pickRenderable
Merge remote-tracking branch 'origin/locals'