Merge "Update to 1.3.3 for release" into casablanca