There are a lot of docblock changes, did your IDE make these? It looks like you might have undone some of my recent Docblock changes (maybe a borked merge?)