Merge "Add skeleton for future feature support"