Forward port branch '7.0' until 421a016

I did a merge of 7.0 in 8.0 and resolved the minor conflicts.
@yvaucher account_analytic_plan_required works as is on 8.0 too, so no need to go to unported.