Initial Merge of Product Compatibility

Initial Merge of Product Compatibility
Revert "Revert "Initial Merge of Product Compatibility""

This reverts commit 4e6b69a82abd6b486e87e30a5dfc485b711f2e7f.