syncing with release branch (includes trans2 fixes)