By @Rushor and @Killyana, finishing touches by yours truly. Closes #6845 (cherry picked from commit 3713b4e423949f2314a68b531ba7c091d4b64c3a)
By @Rushor and @Killyana, finishing touches by yours truly. Closes #6845 (cherry picked from commit 3713b4e423949f2314a68b531ba7c091d4b64c3a)