closes #3369
merged