Finals for remoting and picketbox
Merge pull request #6962 from n1hility/8.x

[8.x] Final for remoting