Merge "Replaceable Defined Component Types fixes"