re #6669 Dumped branch and started again with fresh master
Merge branch 'feature/6669_LoadLogPropertyTable' into develop