410.23 Changed cmd terminology to nv (name:value) for better clarity. Apologies for the rather large merge.
410.24 Clean up canonical machine header file - no functional changes