Reworked requirements to resolve version conflicts
Merge branch 'master' into 15-single-data-table