Updated with latest from the main branch (R8 stuff)