Merge "Fix problem with singleton impact on TC execution"