Make some small changes in core to deal with academic items
approved this merge request
merged
mentioned in commit d2139050