Merge "Do not ask NEW_TASK flag"