We started the review of this PR opened against 1.7.x, but as it is not backwards compatible we agreed to finish the review here, to keep the context, and once it is OK this PR will be closed and reopened against master.