closes #5252, #5253, #5264