Merge from starling
Merge from maker/master