Merge "Fixing default values" into lmp-preview-dev