Zit 3204
Merge branch 'Olap_changes_bb' into dev