Merge "Casablanca final release changes"