merge in lmp-release history after reset to d5205c2648ba1213f28a232379d10b07a7ee9bdc