Merged R30 updates