Starling 1.4 merge