update version
Merge branch 'release/rel2'