deal with academic items

Max Callaghanrequested to merge
academic-item into master

Make some small changes in core to deal with academic items

Merge request reports