Merged from muse--rel--3.02 (patch 25)