REE + various backported patches needed for testing