cherry-pick issues_19. refs #19