Merge from Nivekk