Fix bug with configuration (remove obsolete include/exclude-operations)
Merge branch 'master' into data_beta