Merge pull request #1899 from saper/resgencond