Merge "Out with the old; in with the new" into lmp-preview-dev