Merge "Add --avoid-storing-invocation option"