737.thread stop adjustment

Supersedes #738; Closes #737