Hotfixes for cons models and d-n-d