[development] Splitting up patches