Merge pull request #2799 from jeromekelleher/ls-forward-native

Merge pull request #2799 from jeromekelleher/ls-forward-native #5162