Fix changing files after running Generated Test configuration
Buildserver auto merge