Requested by @haidang
resolved all threads
added 2 commits
Compare with previous version
Modulo small comment LGTM.
added 1 commit
Merging this then.
merged
mentioned in commit 1142d94c