Merge "Add pinning support"