Merge "support suw and post-suw cases for default app"