merge from master to dt-0.9.4 and changes to dimension computation