Merge "Update CP2 snippeting argument defaults (1/2)"