Merge changes from maser