Unreviewed. Adding platform expectations after 105879