Merge branch 'r500-fp'