I suggest to revise all versions and use the latest ones.
I agree that for SI 4.0 we should provide separete branch