Given that introducing goodies to core is not quite simple (as it has implications for aforementioned plugins at least), maybe it deserves a separate (cleaner and simpler to review) pull first?