backport to 02 core