adatp local submitters to use PNN. Fix #1159 #1161

Closed belforte closed 9 years ago