Backport to R13B04