Merge "Fix guard application doc"