Merge pull request #938 from mcarlton00/client-side-native-mode

Merge pull request #938 from mcarlton00/client-side-native-mode #915