Re #7855 Fixing refl
Merge branch 'feature/7588_finish_removing_refl_old_api' into develop