Merge "Native charm support"