Misc external interface refactoring and fixes
Merge pull request #1164 from yurydelendik/extinterface

Misc external interface refactoring and fixes