Merge "Remove assert for R+" into main