[UPDATE PRIMITIVE] Fix bugs 1–5 and implement design improvements 1–3, 5 from v2.25.1-next.2 evaluation

[UPDATE PRIMITIVE] Fix bugs 1–5 and implement design improvements 1–3, 5 from v2.25.1-next.2 evaluation #337