Merge "Initial manila support"