Merge pull request #4425 from wsoltys/suspendinggb