Merge "Put in real "code" (aka marketing) name." into lmp-dev