Merging dimension computation changes from ETL to master