Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev