Merge "More flexible structure for rs benchmark." into graphics-dev