v2.1, pull CastCompanionLibrary commit