infinite loop errors fixed (cherry-picked from 3.3 refs #4706)
Merge branch '3.2/develop' into 3.3/develop