Updated blobs per TeamApexQ commit that was cherry-picked