Merge pull request #533 from jpudysz/feature/copy-native-components-p…

Merge pull request #533 from jpudysz/feature/copy-native-components-p… #898