merge in lmp-mr1-release history after reset to fe8563f4f2a6efe1eb00bb41a5037c88917becfc