Merge from maker changes in starling