Extended protocol + fixed issues
Merge pull request #12034 from grillbiff/master

Extended protocol + fixed issues