Merge master changes into rc.