cleaned up changes before merge in RC1/master as per jons changes