(cherry picked from commit fc6494c569324c839debdb1d08dde23b8f1b8d76) Closes #3376
(cherry picked from commit 6d552f2a60f44052079b5e8944f5e1bbabac56e0) Closes #3361