Better management of "rp" values
Merge branch 'sapns__grid_rp_values' into master2