Partial merge from muse--main--1.0