[development] Bugs to fix before 4.7rc