Re #7855 resolving minor conflict
Merge branch 'feature/7588_finish_removing_refl_old_api' into develop