branch created
merge sock and exec plugins