Merge "Mark CRT objects as vendor available"