Merge "Update docker tags for R3"