a70a6cbe49
Closes #1412
Supersedes #4121
(cherry picked from commit 0ca62a4acc)
Closes #1412
Supersedes #4121
(cherry picked from commit 0ca62a4acc)