Merged 13.0 changes