Merged from muse--main--1.0 (patch 295)