Merge "Bump up version to 1.2.3" into casablanca