Nevermind, I got confused by seeing a fix on master I thought was meant for 4.2 only but I was wrong (made me think we had switched branching strategy)