Merge "Remove ivfenc usage message leading underscores"