Merged and fixed comflicts
Merge branch 'dev' into dev-filter