[v4.2-import] Recent additions to V4.2