Re #7588 last tiny difference to merge
Merge branch 'feature/7588_finish_removing_refl_old_api' into develop