Closes #483150
left review comments
resolved all threads
added 1 commit
Compare with previous version