Closes #5422