Merge df-heist 0.7