Resolving conflicts and re-rolling for 8.4.x and 8.3.x respectively.