This milestone will track items targeted at the next major release -- some big refactors can go in here (while preserving compatibility, of course)