Merge "API: Fix simplified continuation module skipping"