Merge "Fix undefined value used in echo reference" into lmp-dev