Merge "r4 version updates"