The first patch was incorrectly created on top of failover slots not HEAD.Attached patch applies on HEAD.