Merge pull request #1875 from adityamandaleeka/remove_suspension