WIP: Master#435 merge invenio next

Work in progress. Merging the latest version of `invenio/next` (as of 6-oct) #435. This pull-request is a placeholder. This version is merge-able (as #438 is not).