Merge "Update version to 23.0.2" into idea133