Merged from muse--main--1.0 (patch 278, 281-283)