[master][PATCH] Prevent tb during software selection. (#959710)