Merge from nimrod