sprint 29 draft

@njx @adrocknaphobia sprint 29 updates