Merge latest chagnes into di2e after merge "fun"