Merge pull request

Next Tirisfal fixes Rouges deal fix is important for the new script