[packages_10.03.2] lsm: merge r29090, r29199