Merge branch 'suspend' into test