Cherry pick https://github.com/Islandora/islandora/commit/7e2b40bd4499046d7bd860d957880899b4fe4e42 into islandora