merge #2915 (closes #2915, closes #2910)