[development] Re-check "code needs work" patches