backport platform install fix from master