Should probably be backported to 2.8 as well
added 1 commit
Compare with previous version
resolved all threads
merged
mentioned in commit 37396602