Merge "Use CALL_ORIGIN flag"