I have heard that they are going to re-shoot the Epilogue part. They originally did it at a train station (forgot which one) but it was too chaotic and the director and actors felt rushed through the scenes. Once confirmation is out we will know which scenes will be reshot.