Merge "r3.0.1 version updates" into casablanca