oakstop changes
Merge remote-tracking branch 'origin/sunday' into sunday
specified iteration convergence 64, and prolificness