I've integrated a key fix into a branch that needs to be up-levelled