Merge remote branch 'origin/feature/7468_clearup_old_api_interfaces'
Re #7499 Fix minor conflict
Re #7498. Return empty table for more cases.
Re #7498. Adding initial support for adara files.
Re #7498. Refactored code to make type selection clearer.
Merge branch 'feature/7498_chunk_improvement' into develop