Don't add primary and hydra_set_id columns to query if calculation is performed #2
Add changes for v0.4.2
Merge branch 'master' into value_model_optimization