Revert "Revert "Merge pull request #1368 from zombie/903039-native-options""

This reverts commit 21bb6639fc2546cc2e466532edbc988453a372d0.