Closes #5424