[development] Prioritizing for code freeze