Merge in static branch