Merge "soft version 2.34" into main