Insulate panda interaction in a specific class. CAF-17
fix confict
Merge pull request #3997 from spigad/master

merge mmascher-insulate-panda