At your suggestion I took out the first patch and left the second and the problem appears to remain fixed - at least in normal build.
At your suggestion I took out the first patch and left the second and the problem appears to remain fixed - at least in normal build.