Avoid the second basic propagation iteration to confirm convergence in production builds.

Avoid the second basic propagation iteration to confirm convergence in production builds. #1024