Merge pull request #1617 from Azaezel/deferedWrapupOrder