Applied custom starling patches after merge