Reverted Thru changes on branch release/4.0 (breaking thread/merge-safety).