Update version and changelog to sync with stable branch