Update common version
Merge remote-tracking branch 'upstream/dev' into dev
Merge remote-tracking branch 'upstream/dev' into dev