Closes #3457914
added 1 commit
Compare with previous version
Will need test coverage
resolved all threads