weekly merge master <- stabilization
weekly merge master -> stabilization