merge maser with _customui_ branch