Commits from Invenio@next branch