Re #7855 Remove old API from Refl code
Re #7855 Remove commented code
Re #7855 Fix issue with int property
Re #7855 Resolve conflict with master
Re #7855 Fixing refl
Re #7855 fix conflict with master
Re #7855 resolving minor conflict
Re #7855 Fix conflict with most recent version of master
Re #7588 last tiny difference to merge
Merge remote-tracking branch 'origin/feature/7588_finish_removing_refl_old_api'