merge in lmp-mr1-release history after reset to 0ecd4dd5dd21f1f623a55f43db1b783aad82e5b6