MIFOSX-365: Simplify 'Data Tables' functionality
Merge remote-tracking branch 'lech/MIFOSX-365' into develop