Commented function calls.  Because these files will be externally available.
Merge remote-tracking branch 'origin/v12' into v12