merge 0d3c70ddebe79cf372d00aa221eae3c61e684da7, refs #1073 and #1074