should prevent cyclic wait-notify
Merge pull request #3519 from gurbuzali/cyclic-fix/maintenance

should prevent cyclic wait-notify