Merge "Fix unable to create base.art" into main